Adwaita: simpler active switch background

...removing the progressbar_fill mixin in the process.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 4a1cf5fdddb6c8c2cbf1fd99c44c59a879727d9b..ce70a87ac51b990e20bc0c59a715637184b7ad61 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1941,9 +1941,10 @@ switch {
   background-image: linear-gradient(to bottom, mix($bg_color, $borders_color, 60%));
   text-shadow: 0 1px transparentize(black, 0.9);
   &:active {
-      @include progressbar_fill;
       color: white;
       border-color: $selected_borders_color;
+      background-color: $selected_bg_color;
+      background-image: none;
       box-shadow: _widget_edge();
       text-shadow: 0 1px transparentize($selected_borders_color, 0.5),
                    0 0 2px transparentize(white, 0.4);

diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 4a50c7b918c5a5d58c5f276d7a494931f975985d..46498945222063944767f7405b85a9013af59340 100644 (file)
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -463,12 +463,6 @@
   @else { box-shadow: none; }
 }
 
-@mixin progressbar_fill($d:horizontal) {
-  $dir: if($d==vertical,right,bottom);
-  background-image: linear-gradient(to $dir, $selected_bg_color 2px,
-                                             lighten($selected_bg_color, 6%));
-}
-
 @function headerbar_gradient($c, $tc:lighten($c, 2%)) {
 //
 // headerbar gradient helper function

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 92a4a5a8505d5c77976bcad5691967e475820cf4..d2ad78836126e2adc4cac488f12a0925f78de1c0 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2494,9 +2494,10 @@ switch {
     -GtkSwitch-slider-width: 45px;
     -GtkSwitch-slider-height: 27px; }
   switch:active {
-    background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
     color: white;
     border-color: #0f2b48;
+    background-color: #215d9c;
+    background-image: none;
     box-shadow: 0 1px rgba(238, 238, 236, 0);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 2c79a2992b55098f57ea606bbc37c736f39131f8..4116c170b4b8e607b99949b69af226afc33d96a7 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2500,9 +2500,10 @@ switch {
     -GtkSwitch-slider-width: 45px;
     -GtkSwitch-slider-height: 27px; }
   switch:active {
-    background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
     color: white;
     border-color: #184472;
+    background-color: #4a90d9;
+    background-image: none;
     box-shadow: 0 1px rgba(255, 255, 255, 0);
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {